public class GitDemo {
    public static void main(String[] args) {
        int a = 1;
        int b = 2;
        int c = a + b;
        System.out.println(c);
        System.out.println("修改了的");
        System.out.println("我这里也修改了 public");
        System.out.println(c);
        // 冲突冲啊2
        // 冲突冲啊1
    }

}
